Make sure the action of the button and the dialog are in sync, when the

2005-05-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor):
	Make sure the action of the button and the dialog are in sync,
	when the dialog is provided by the app.  (#303987, David A Knight)

diff --git a/ChangeLog b/ChangeLog
index b1897b77b8ba41ca2811005d20ef782820f9dba8..30971cb87f20af6761a6523972ce350a53a33d1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+       Make sure the action of the button and the dialog are in sync,
+       when the dialog is provided by the app.  (#303987, David A Knight)
+
        * gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
        in the docs.  (#303940, Masao Mutoh)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b1897b77b8ba41ca2811005d20ef782820f9dba8..30971cb87f20af6761a6523972ce350a53a33d1c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+       Make sure the action of the button and the dialog are in sync,
+       when the dialog is provided by the app.  (#303987, David A Knight)
+
        * gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
        in the docs.  (#303940, Masao Mutoh)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b1897b77b8ba41ca2811005d20ef782820f9dba8..30971cb87f20af6761a6523972ce350a53a33d1c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
+       Make sure the action of the button and the dialog are in sync,
+       when the dialog is provided by the app.  (#303987, David A Knight)
+
        * gdk/gdkpango.c (gdk_pango_renderer_get_default): Fix a typo
        in the docs.  (#303940, Masao Mutoh)
 

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 5c6794b2dfab88f88d3b0fe029d89836de646321..f0fe1630d0003a396cba3c12d018e39958c56ff7 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -679,8 +679,12 @@ gtk_file_chooser_button_constructor (GType                  type,
                                        combo_box_row_separator_func,
                                        NULL, NULL);
 
-  update_label_and_image (GTK_FILE_CHOOSER_BUTTON (object));
-  update_combo_box (GTK_FILE_CHOOSER_BUTTON (object));
+  /* set up the action for a user-provided dialog, this also updates
+   * the label, image and combobox
+   */
+  g_object_set (object, 
+               "action", gtk_file_chooser_get_action (GTK_FILE_CHOOSER (priv->dialog)),
+               NULL);
 
   priv->fs_volumes_changed_id =
     g_signal_connect (priv->fs, "volumes-changed",
@@ -712,7 +716,6 @@ gtk_file_chooser_button_set_property (GObject      *object,
       gtk_file_chooser_button_set_width_chars (GTK_FILE_CHOOSER_BUTTON (object),
                                               g_value_get_int (value));
       break;
-
     case GTK_FILE_CHOOSER_PROP_ACTION:
       switch (g_value_get_enum (value))
        {